Beautify & fixed the order system
minor change