Undoing some of the things I changed in my merge with master such as upper casing some variable names