Merge pull request #20 from DocOnDev/clean

Moves creation of story into story class
Clean up simple formatting issues