Formatting define. #discussion-diff-7475362
Minor refactor.

discussion-diff-7475420
discussion-diff-7475435
discussion-diff-7475531
Minor refactor.

discussion-diff-7475559
discussion-diff-7475577
discussion-diff-7475839
discussion-diff-7475952
discussion-diff-7476113
discussion-diff-7476214
Minor refactor.

discussion-diff-7476445
discussion-diff-7476511
discussion-diff-7476703
discussion-diff-7476874
discussion-diff-7477120
Minor refactor.

discussion-diff-7477233
discussion-diff-7477262
discussion-diff-7477383
discussion-diff-7480217
discussion-diff-7480376
discussion-diff-7480446
discussion-diff-7480527
Minor refactor.

discussion-diff-7480808
discussion-diff-7480963