Minor edits
Minor edits

Some code layout improvements and cleanup