- refactoring controls (simple version)