changed formating
cool property filtering
nicer internal callback names