Add spec comment & remove commented code