some minor code clean up