refactored code and file name