cleaned up controls