Clean up comments and variables

Cleaned up a comment line and updated the variable names to be more
explicit