A bit cleaner..