replaced hardcoded string by constants