Refactor helpers and comments for constants.