First pass for formatting

Removal of Comments, removal of required flag when giving a default
value. Rename of functions to be more descriptive - first pass for now.