s_closure refactoring