Refactor Diamond.sol for performance and cleanliness#4

dadadave80 merged 2 commits intomaindadadave80/diamond-lib:mainfrom

fix/optimize-diamond-cutdadadave80/diamond-lib:fix/optimize-diamond-cutCopy head branch name to clipboard