Scrutinizer and cleanups

tidying up
don't we have a public api for this as well

@icewind1991 THX