Continue with code cleanup. Start changing args.