Refactor logging to use slf4j