Small commit

A few variable-name and method-name changes; deleted pointless comments