Change to better format method calls