Cleaned up interface selection