Did some code cleanup and fixed a bug regarding food selection