Indentation and code clean up