Make nullable less complicated