removed terminators after code review