Fixed CS
Improved and fixed some phpdoc
Removed unused arguments
Aliased some use statements conflicting with existing classes