further cleanup of method names