Code cleanup & config changes