Refactor listing availabilities