Internal cleanup

Assistant code janitor reporting for duty!

(Ouch, my hands hurt now...)