Refactored long check