Cleaned up a bit the smuggler main program