removed some unnecessary constants