Minor cleanup

The readme wasn't that pretty, and you were using non-static inner classes.