some cleanup. Updated sql with dummy names.