some tidying up
hopefully, a fix