Better main, simpler config