Refactor lines, keep non-scoped fns out of scope
Merge branch 'master' of github.com:systemed/iD