cleaned up case classes and added per serving info