Add some colors, restructure code