changed some stylistic things