code cleanup while i try to decide what comes next...