Cleaned/edited Coffee.java and CoffeeHelper.java