code cleanup, a little