Cut long lines + add comments
Add getType() to Watched()