Documenting more things
Moving to constants