refactoring
cleanup file