Indentation fixes and a little bit code cleanup