Removed duplicate code for default values