Added static to the constants. Also, file had lost all newlines and fixed this along the way (which is why it looks like a big commit).