Cleanup, evaluation and modulus operator

Super neat.