Fix some of #1138

Fix indentation, formatting and some spelling.