Fixed some stylistic issue