cleaned up comments and unused variables