-newline, more cleanup