Refactor and upgrading CodeFramework
Upgraded the Issue comment section