Standardizing

Changing the code to look more uniform(adding functions) and renaming
inputs