Remove static_cast to int