Added comments functionality
Refactoring specs