Cleaned up SolveActionCallback code