Remove magic strings/numbers and replace with constants.
Added version comment