refactor + fix #55