Refactor services into checks