Refactor #24