minor code cleanning