Fix comments and improve method names.
6 files changed