WILT complexity
refactoring
fix for reading comments with comma