Refactoring force log/single point logic