Constants

I tucked the const getting and setting away a bit.