Cleaned up using statement