Cleanup

Moved some raw values to named constants.