Cleanup and whitespaces