Removing hardcoded values