Cleanup: removing reinterpret_casts
Cleanup: removed reinterpret_casts