Refactored the file so the only diffs that show on GitHub are the relevant ones.