[fixup] colors
Code re-organization