More Code Clean Up On Indentation