STY: Cleaner imports
Merge pull request #837 from Eric89GXL/imports

STY: Cleaner imports