Config scrutinizer
Code cleanup