Removed white space, unneeded hardcoded values, and standarized some lines