cosmetic changes, added comments and evaluator.hpp