Avoided unnecessary definition of constants