Cleaned up the code

Designed this as a better template for mass editing; better descriptions
and examples are included in code.