Some tweaks

Made opt_algorithm to simple variable as the other opt_* variables
And i like macros! :)