bunch more indentation fixes