some cleanup for scrutinizer