small cleanup changes from the previous version.