Formatting, alllignment and some code clearance