#000 Refactor the file