Cleaning a little bit..