Refactors checks