Resequence to match UI sequence
Make indentation with tabs consistent