Minor code clean up to start with a clean base