cleanup
initial implementation of Fluent