Intendation cleanup