Clean_up

Cleaned up comments and fix mis-named variables.