few unused imports removed, some refactoring.
Merge remote-tracking branch 'origin/master'