Clean up, + new line at end of line