Organise ,update and cleanup