code cleanup
additional nutritional info added
merge with master - code cleanup, additional nutritional info shown