capitalized the constant names and removed a douplicate import