Simplify first check code