[MISC] Review code architecture