Tidied some using statements.