Code Indentation Clean Up