Code styling and typos