Tweaked use statements and docblocks
CS fixes
Tweaks