Refactor conditional in bye_bye method