(#8) Added excerpt

General tidy up as well