Factor out some variables
Change file name