Refactor, fix #2