Reviewed evaluation calcuations. Includes renaming and a little bit of code cleaning