formatting fixes, removing redundant code, regexp fix
Merge pull request #190 from Animatron/color-tween

formatting fixes, removing redundant code, regexp fix