Optimized imports with new code style.
Merge pull request #156 from avasquez614/master

Optimized imports with new code style.