code cleanup

Another one. :smirk: