Fix for reading P2-3D file format and small refactorisation.