Use logger
Add missing @Overrides
Use more efficient logging method
Minor code cleanup