Refactoring + Readme