Improve some method names and add comments.