Cleaned Up

Added variables for file names and neatened some code formatting.