delete story added. a few refactors