Reorganize code
Remove "h" from "time to sober"
Merge remote-tracking branch 'origin/master'