module refactoring
handling empty files