TODO + readme.md + code refactoring