pithy improvements :)