Cleaned up parameters