a little cleanup of using statements