a few changes to appease the scrutinizer, simplifying some methods.