Clean up default value code