Fix boolean CS
Clean up