cleaned up default handling