[2.3][Form] Cleanup & fix phpdocs