comments and private method name changes