address review comments

- minor refactoring, do the conversion to mixer range earlier
- commit will be merged into the previous commits