v.35: Code cleanup