Clean up Link Builder some