Clean up, added Boolean tokens