Clean code; Introduce sFLOW support