Tidied up input class