code cleanupe