Refactoring + README