Cleaned up input class