Move options into struct to clean up function calls