Refactored Story and Comment for simpler use case