Refactoring harness to my liking