Cosmetics. Added a few consts.