Made some simplifications.