Refactors for missing break