Removing some hard-coded values