Minor: fmt, imports