refactor control systems