cleaned up some using statements