formatting + clean up disconnect.waitOnFuture()
cleanup unnecessary method