codecleanup thomas