Moved input_options to its own file. Minor refactoring