Code Indentation Clean Up And Review