Some styling and indentation fixes