Scrutinizer and cleanups

tidying up