more code cleaning

more