Config tweaks
Code cleanup