Refactoring...

I'm using Options and Input, they could be the same to save code.