and more indentation fixes