Minor update of output and code style