[TASK] Code cleanup and composer.json update