some refactoring
bumped version