chore(standby): minor changes based on comments