Small code clean ups