a little bit of a cleanup. more to come