Dropped some unnecessary constants