Fix artifact names
Add pretty printing