code refactor and improvement#6203

pushya22 merged 4 commits intopreviewmakeplane/plane:previewfrom

code-refactor-and-improvementmakeplane/plane:code-refactor-and-improvementCopy head branch name to clipboard