more constants readability updates