minor code cleaning
more code cleaning