Further refactoring during code reviews by product leads.
Remove imports with wildcards.
Merge pull request #224 from hastef88/overall_refactoring_v3

Further refactoring during code reviews by product leads.