cleaned stuff... quite a lot