Minor Code Cleanup

Nothing special .. just some code clean up