More 100 char line to 80 char lines and refactoring...