added to TODO list on README, slight refactoring