[TASK] Updated readme, more refactoring