Made some changes after suggestions made.