Removing useless FQN
Better PHPDoc
CS fixing