some code clean up -don't code late at nite