Cleanup; use args instead of hardcoded options