Replaced if/else if for cup size with array, cleaned up formatting
added