(code cleanup). Removed some redundancies and added stub for enforce_connectivity() method.