Fixed style issues & typos according to review