use predefined constants
updated comments