little more code cleanup