Fix a little naming and indentation in alter
Simplify alter a bit