Final Tidy ups before release