subscription views and tidy up