Made value argument optional.  

Made value argument optional. Toggle if omitted.
Restructured for future command expansion.