Refactored to use base class for enum style cols

After suggestion by @opalmer