Some cleanup, repetition pending