change logging strategy for easier maintenance