Improved debug

Removed & commented