Code Cleanup

1. Removed unnecessary conditions from the if statements.
Merge remote-tracking branch 'origin/HeatBarFood'