Refactored how --no-log functions