Format review and typos fix