Reformatted if blocks containing 'return' (focusing on title-building)

[hopperelec]

The changes I've made significantly reduce nesting, reduce duplicate code and avoid some unnecessary checks

I also corrected a typo in File.ts, since I thought it would be excessive to have a dedicated PR for this.

[mlomb]

oopsie