Refactoring in table.cpp + PULSE mode