Fix typos and style guide errors. MJ-540