Finished notification tidy up