Some syntax cleanup, got first line breaks working for the most part