Increased coding-standard and phpDocumentor2 compliance