Clean up code, add `untilMessage` and `addTableClass` options