Removed the caching footer stuff
Renamed some modules and vars