Some codecleanings.