Refactoring
updated readme