refactoring
removed undefined data