commit 2 just cleaning things up a bit, no code changes.