hygiene and appearance

Change-Id: I8b7d3eb67e4cbed0d9ca3e104876c8f1493b2bb9