Refactor #200