Refactored logging to use service decorators. Misc PR cleanup.