Refactoring of the code, Nutrition queries