missing newlines, cleanup