Small refactors [#21]