Story.ni code clean up.