..a little code cleanup