bug fix
cleanup