unwrapping some redundant brace levels
clearing up nested conditionals