Set protein to 2.0 rather than 2.2
Comment out non used function
Use a hash to calculate mkcal