Format

No functional changes
Constants are simpler as vals