* Fixed some small issues.
* Optimized imports with new code style.
Merge pull request #81 from avasquez614/master

* Fixed some small issues.