Fix linebreaks & two leftovers from the refactoring