More cleanup and indentation fixes