improve input class