long if-statements re-aligned