(minor) some indentation and coding style fixes