More design cleanup