Refactor completed exercises