little bit a cleanup