Refactored the file.