Refactor / remove some hardcoded values