Clean up order and update compile.