Small refactor
fix reflection warnings