Clean up dictionary creation