[CLEANUP]: Code cleanup and license update