refactoring
removing some todo