added style and fixed some typos
merge commits