Improved some method names and comments.