replaced hardcode with constants