small code clean up