Recent tidy up of my work/play setup