Consolidate some small solving functions