Active state fix for first comment

closes #62
- Small refactor
- Handle component state internally