Clean up Method Names