cleanup and minor style fix