(refactor) Use Logger for both before and after.