fix indentation
unify _wait_for_nul_metric method
fix bucket iterator