Removed code redundancy in check_software