added '*.tar.gz' for cleanup() and minor style fixes