readme, refactoring