Cleanup
Optimize usings