a bit cleanup