Fix issue raised in critic
Re-order with stdlib first, then packages and then local