Cleaned up the input class some more.