Neater comment style, fix indentation
Cleanup Story activity