Make custom formatting better#40

mendelsshop wants to merge 14 commits intogsingh93:mastergsingh93/trace:masterfrom

mendelsshop:mastermendelsshop/trace:masterCopy head branch name to clipboard