Refactoring

Rename methods. Remove unnecessary indirection.