Make constants uppercase. Move them to top of file