Added two constants, and stylistic changes.