Refactor a bit, use short info output instead.