- removed unused declaration
- moved function