cleaning up code and adding quantity ordered