Made some stylistic changes