Small refactor.
Fixed #60