Fix random CS issues in code & phpdocs