cleaning up some private method names