Minor changes some code clean up