Changing order of delcarations and proper aligning, as per Obenland