Refactor #17