add comments
Refactating spec