Spring cleaning
Updated logging