cleanup and more consistent naming