Add additional options
Clean up code