1. Add ido-at-point
2. Clean code