Clean up more around input parsing