Added and used more constants