Cleaning up a little

making my functions and function calls consistent.