[kuroneko] minor cleanup to get some structure into this