Added 2 refactors and the different file names for a bonus feature