Traded the newline split for a better regex