Columns controller: minor refactor