Refactor SRM/Izh and plot functions