Logger - comments-based refactor