Merge branch 'master' into output_format
Revert "Added code tagging for Jason"

This reverts commit 2670635352612e23222f2c885acf70ec09438b5d.
Revise and Formatted Code Tagging