Refactor places to be e10s ready, more functional