cleanup + intendation fixes
cleanup + intendation fixes