cleaned up using statements throughout
updates