bumped version and minor refactoring