cleaned up comments & vars