Cleaned up arguments