Refactor check* methods