Improved variable access and eliminated unused files