Some more clean up to remove indetation