couple of changes to make things neater