Better use of controls