Removing hardcoding