Code Cleanup and indentation