more function -> property cleanup