Clean up evaluation code a little bit.
Update the realname and add some dev comments.