Remove unused codes
New `Dict` syntax
Optimize