Minor clean up with decent starting network