Coding style improvements, indents fixed