Cleaned up comments and variable names