Fixed private variables in all classes and deleted unused imports.