Cleanup of variable naming and consts.

IMHO the comments one the same column like it was before is easier to read.