Indentation & format fixes