- Tidied some bits
- Use logger for debug stuffs instead of print