fixed encoding issues
cleanup