Order: Added usage and cleaned up a little