First little bit of hoouse cleaning