a little more code cleanup