cleaned up some more method names, using underscores necessary for private methods