Cleaned up main function with new docopt params