Made more minor changes