Add spec and modify comments