Reorder things to be a bit saner