Slightly improve design