Code cleanup 2 (a third one is pending)