Cleaning up and indentation fixes