cleaned up using statements