Refactored to use constant logger
Refactored long methods