Fix incorrect stream operator composition
End of namespace styling
Fix flat map after refactor