Some more minor conditionality and removed whitespace effort