Cleanup some method names and add some comments.