Minor code style changes and typos