BedProvider and GoToBed refactor