more cleanup. fixed casting to string.