Refactoring of code, new README