some codecleanings