Removed unused variables and imports. Increased access modificators.
Removed unused variables and imports. Increased access modificators.