style improvements, better property id extraction