English improvements + indentation