Improve coding style

Improvements to indentations and coding style to better comply with the
standards.