Formatting
Commenting
Remove dead code
Rename dictionary file