- cleaned unused import
- moved a function