Code cleanup: Move const from comments to code