Docs, argument annotaions and PSR-2 fixes