Cleanup and Orgranise