- Clean code
- Fix some stupid mistake