Simplify the use of "Software" and "software"