Final reorder of code.