Move user input to positional args

Plus some cleanups