removing unnecessary constants