comment and code cleaning