Arguments code cleanup (using options dict only)