More indentation fixes. Ran through each file with some vim commands.