Cleaned up a constant name and some comments