Change int returns to Bool's whenever possible