Minor cs fixes.
Optimized imports.
Merge pull request #2140 from cmfcmf/cs-fixes

Cs fixes, optimized and rearranged imports