Replaced couple of hardcoded vars with constants