Cleanup and better handling of special characters