Some indentation fixes in the code