Reseated comments

Moved all CONST to top of file