Remove line ending rule
Rework commands, events