removed unused imports, reduced visibility of variables where applicable
Merge pull request #8 from JulianCurrie/some_cleanup

removed unused imports, reduced visibility of variables where applicable