better visual organizaton, no logic change