Clean up

- Re-factoring
  - Remove needless '='
  - better candidates specified