Refactor / reformat code - consistent TAB / Space use