Removed some hard-coded values.