add suffix option. remove unused imports.