Cleaned up using statements