refactoring + bug fix

8 jobs for bug_and_refactor in 136 minutes and 11 seconds (queued for 2 seconds)