Feature/reporter

The else clause could be directly on the same line