improve dicitonary
clean up