Factored out more constants