minor code cleaning