minor improvements to style and consistency
caught typo/bug: reused variable name 'hash' after refactoring of TrackerClient
improved readability of imports across all source and test files