got rid of unnecessary constants