remove duplicates by import, code changes: tabs replaced with spaces
code formatting changes: tabs replaced with spaces, some other small formatting enhancements
Merge pull request #618 from mariroz/dev

remove duplicates by import; code formatting changes: tabs replaced with spaces