Code Cleanup. Indenting.