Code cleanup

removed old commented code.  and fixed some name stuff