Cleaning trailing whitespaces & fixing returns