[sunporno] Modernize