Small refactor. fixed #107