tweak on colors and code cleanness