some refactoring
REAdme update