code cleanup on Subnet methods