clean up order and comments