Cleanup code
Don't rely on user input for the timeout unit
Add list of supported timeouts for XPS13 9333