more code cleaning