refactoring
minors
trying to solve #43