Move constants and defaults out