refactoring, + ToDo
+ readme