Remove import * and fix some formatting