Fix import and cosmetic changes