Removing old linebreaking, replacing with more flexible implementation