fix(#35, #36): fix minor issues, minor refactors