Improve listing style conventions a bit to match simple listing