More code style / indentation fixes