style fiddling and cleanup