Clean-up and new lines