re-arranged newlines to break strings and consolidate blocks