Fix bug regarding simplification
Removed unused typedefs
Introduce timer of update function