Clean up the input class a bit