Fixing the Listing format

Change-Id: I8735a28bd4fb19c7fa3a22a3c877f9dd7ff878b4