some cleanup of the const comments