Feature/en 1831

Style issue, I'm strongly against single line if statements for readabilities sake.