X3P read-in functionality code cleaned up a bit