Added validation and removed unneccessary input options