Updating the syntax of some of the functions and variables so they aren't so varied