more code cleaning/fixing