Clean up SystemDescription code a bit