fixes
Remove redundant complexity
Refactor, add TODO
Refactor, simplify, clarify
Add proper logging
Fix bugs, refactor, clean