lots more code cleaning