Remove/re-order some things for a better program flow.