Code cleanup, story file added