Cleaned up the code
Matches the final version of run_analysis.R