removed unnessesary constants