Cleanup of variable naming and consts.