Rename _s to s
Remove comment