Updated the file names to coincide with the underlying functions, updated variable names and removed uneeded functions.