a little bit more cleaning up...