Refactor enot
0.3.30