refactored logging and timing