stories refactored

Signed-off-by: FunThomas424242 <funthomas424242@gmail.com>
refactoring

Signed-off-by: FunThomas424242 <funthomas424242@gmail.com>