Removed use of super-globals