Cleaned up property definitions