Made some simplifications