tmp: code cleaning