Comment cleanup and more meaningful method names.