Clean up SystemDescription code a bit
Merge pull request #454 from SUSE/review_141216_cleanup_system_description

Clean up SystemDescription code a bit