Fix the indents
Make the enum orders consistent.