Refactor >80 char lines #2