Refactor to return true / false