Refactor #46