code style changes
added attaching of additional artifacts