Made some simple changes