Fixed minor issues in input classes and moved input setup to separate
method for tidyness :)