Minor refactoring of method names to improve meaning. Added comments to vital methods.