- performance optimized
- cleaned a bit