Refactoring. Added todo to readme.