Made some minor changes