Fixed indentation and coding style issues