a little bit of cleanup. more to come