refactoring
todo comments