Update spacing and imports