cleanup, add boolean that is readable