More code clean ups