remove some clutter, add useful information, where necessary