Feature/en 1831

Any reason for this? And the indentation below?