Pulled out constants into variables where they belong