Tidying up before tags
Tags half way there