Cleaned up indentation and matched on true, false