Prettied up the code
Used model methods in order history
Merge conflict