Refactor.
Refactor. Remove some logging. Remove unused private method.