minor code clean up