more code cleaning, dotting