Clean up method chaining