Cleanup and indent more code