small code clean ups