CS. Moved const definitions to the proper place