Remove unnecessary indentation

Let's stop with this bullshit once and for all.
Simplify logic in helper methods