Refactor entity started check for readability