Refactoring + added README