style and indentation updates