minor improvements

better naming, comments, and deletes some unused methods