Moved options handling to src/options.c