Removed redundant macro definitions and rearranged code. Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>