Remove unused import
Add macro?
Add missing fn
Whitespace