refactor (break up lines >80c)