News: refactor a bit...