a bit of code cleaup.