Removed namespaces, imported Input and MathExtra