cleaned up property definitions