little bit cleanup