Cleanup archive definitions

Renamed tar-gz to tgz to clear up deprecation notices
Syntax and formating cleanup of both definitions