Tidy up and prepare for implenting notification controller class