Refactored to use separate handler and logger.

Refactored to use separate handler and logger. #482