Removing some hardcoded values