minor fiddling with the code