Restructured based on suggestions