- Fixed memory leak
- Cosmetics