Cleaning up fluent syntax