Refactor with @surenm