r31: Code cleanup