fix conversion
cleanup