Cleanup code
Fixed PHPDoc
CS fixes