Minor cleanup, and detect colorcolumn feature