Refactoring + fixed README.MD