make some ifs more legible
indentation fix
one more legibility @if fix