Cleaned up args as requested