Feature/design cleanup