Better way to wrapper input