More indentation and beauty fixes