Add Vim coloring
cleaner code