Adding tags(yaaaay), a bit of content cleanup