Minor Formatting and Comments
Formating
Minor formating and IDE changes/mappings
Merge remote-tracking branch 'origin/master'