Inset comment and code cleaning