Refactor - reduce unnecessary nesting of ifs

Shouldn't change anything.
wip how_long changes, Bangladesh etc