Config tweaks + code cleanup