Updating content, tidying code