*small cosmetic changes for final commit.