Internal cleanups: method names, comments