Refactoring and improvements of VSpec reader.