fixed all "magic property" warnings