Removing a wrong comment
Refactoring component handler
Refactoring component handling

It's now much easier to see what's happening