got rid of some hard-coded values