refactoring. Add float and double. Grouping be txt