Code refactoring/update README