Fixing code review issues
Fixing specs after code review