Fluent composite type refactored and cleaned up