Cleaned up usings
Code cleanup