Updated style and indentation