Added 'cleanup.sh' plus tidyup