Config Tool and Code Cleanup