Fix spaces & if statements